Mcp v1 v2 changes python by biswapm · Pull Request #265 · microsoft/Agent365-Samples

biswapm · 2026-04-03T14:54:21Z

No description provided.

…ll Python samples - Update list_tool_servers() calls to pass authorization_context instead of auth_token - Extract V2 MCPServerConfig fields (audience, scope, publisher, headers) from SDK configs - Implement per-server header merging {**base_headers, **server_headers} in claude, crewai, google-adk - Update all ToolingManifest.json with V2 server catalog (mcp_Admin365_GraphTools, mcp_OneDriveRemoteServer, mcp_SharePointRemoteServer, mcp_TeamsServerV1) - Update .env.template files with AGENTIC_APP_ID and other V2-required variables - Add 59 unit tests across all 5 Python samples (pytest with SDK mocking) - Add a365 artifact patterns to .gitignore

github-actions · 2026-04-03T14:54:37Z

⚠️ Deprecation Warning: The deny-licenses option is deprecated for possible removal in the next major release. For more information, see issue 997.

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Snapshot Warnings

⚠️: No snapshots were found for the head SHA 7172e1c.

Ensure that dependencies are being submitted on PR branches and consider enabling retry-on-snapshot-warnings. See the documentation for more information and troubleshooting advice.

Scanned Files

None

Resolved conflicts by taking the branch's V2-aware versions: - ToolingManifest.json (agent-framework, google-adk, openai): kept full 5-server list with V2 entries and publisher field - .env.template (google-adk): kept expanded V2 auth/identity documentation - mcp_tool_registration_service.py (google-adk): kept per-audience V2 token acquisition logic

…into mcp-v1-v2-changes-python

- Fix CrewAI legacy list_tool_servers() to pass authorization, auth_handler_name, and turn_context to the SDK so V2 per-audience tokens are acquired correctly - Document BEARER_TOKEN_MCP_<SERVER> dev env vars in all five .env.template files (openai, agent-framework, claude, crewai, google-adk) for V2 blueprint local testing

- Add _check_jwt_expiry to agent-framework, openai, claude, crewai samples with warning + token discard when BEARER_TOKEN or per-server tokens expire - Use generic BEARER_TOKEN_ prefix filter (not BEARER_TOKEN_MCP_ only) so non-MCP-prefixed server names are supported in all 5 samples - Switch ENVIRONMENT -> PYTHON_ENVIRONMENT in openai and claude samples - Default USE_AGENTIC_AUTH=false and AUTH_HANDLER_NAME= (empty) in all .env.template files for local-dev-first consistency with google-adk - Update ToolingManifest.json to V2 format (Tools.ListInvoke.All + per-server audience GUIDs) in agent-framework, claude, crewai, openai

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Updates Python sample agents to align with MCP v2 configuration and authentication patterns, including per-server token support and refreshed manifests/templates.

Changes:

Added JWT expiry checks + per-server bearer token awareness to avoid confusing 401s and stale-token hangs.
Updated MCP server manifests to v2 fields (scope/audience/publisher) and expanded .env.template guidance.
Updated Google ADK/CrewAI/Claude/Agent Framework integrations for v2 server discovery (ToolOptions, per-audience headers) and environment variable conventions.

Reviewed changes

Copilot reviewed 22 out of 23 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
python/openai/sample-agent/agent.py	Adds JWT expiry validation and switches env var to `PYTHON_ENVIRONMENT` for dev-mode fallback logic.
python/openai/sample-agent/ToolingManifest.json	Updates sample MCP servers to v2 scope/audience/publisher and adds CalendarTools.
python/openai/sample-agent/.env.template	Major rewrite to document required env vars and v2 token patterns.
python/google-adk/sample-agent/pyproject.toml	Adds Google ADK tooling extensions dependency for Agent 365 tooling.
python/google-adk/sample-agent/mcp_tool_registration_service.py	Uses ToolOptions + per-audience headers, adds logging and timeouts.
python/google-adk/sample-agent/main.py	Forces UTF-8 output on Windows; switches prod detection to `PYTHON_ENVIRONMENT`.
python/google-adk/sample-agent/agent.py	Updates `run_debug` call signature; adds JWT expiry checks + per-server token warnings.
python/google-adk/sample-agent/ToolingManifest.json	Updates sample MCP servers to v2 scope/audience/publisher and adds CalendarTools.
python/google-adk/sample-agent/.env.template	Expands env template and documents v2 per-server bearer tokens + identity settings.
python/crewai/sample_agent/mcp_tool_registration_service.py	Adds ToolOptions/per-audience headers support and JWT expiry checks.
python/crewai/sample_agent/agent.py	Changes default `USE_AGENTIC_AUTH` to false.
python/crewai/sample_agent/ToolingManifest.json	Removes older servers and updates remaining servers to v2 fields.
python/crewai/sample_agent/.env.template	Reworks template for identity/auth/v2 per-server tokens and clarifies required values.
python/claude/sample-agent/pyproject.toml	Adds pytest asyncio configuration defaults.
python/claude/sample-agent/mcp_tool_registration_service.py	Adds ToolOptions/per-audience headers support and switches to `PYTHON_ENVIRONMENT`.
python/claude/sample-agent/agent.py	Changes default `USE_AGENTIC_AUTH` to false.
python/claude/sample-agent/ToolingManifest.json	Removes older servers and updates remaining servers to v2 fields.
python/claude/sample-agent/.env.template	Reworks template for identity/auth/v2 per-server token guidance and connection settings.
python/agent-framework/sample-agent/pyproject.toml	Adds pytest testpaths configuration.
python/agent-framework/sample-agent/agent.py	Adds JWT expiry checks and per-server token warnings when configuring MCP servers.
python/agent-framework/sample-agent/ToolingManifest.json	Updates sample MCP servers to v2 scope/audience/publisher and adds CalendarTools.
python/agent-framework/sample-agent/.env.template	Major rewrite to document required env vars and v2 per-server token patterns.
.gitignore	Ignores Agent 365 generated config + deployment artifacts.

Copilot · 2026-04-15T12:26:03Z

+    sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")
+    sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding="utf-8", errors="replace")
+


sys.stdout / sys.stderr are not guaranteed to have a .buffer attribute (e.g., when stdout is already wrapped, redirected, or replaced by a StringIO in some hosting/test environments). This will raise AttributeError at import time. Consider guarding with hasattr(sys.stdout, "buffer") / hasattr(sys.stderr, "buffer"), or using sys.stdout.reconfigure(...) when available, falling back only if the buffer exists.

Suggested change

sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")

sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding="utf-8", errors="replace")

if hasattr(sys.stdout, "reconfigure"):

sys.stdout.reconfigure(encoding="utf-8", errors="replace")

elif hasattr(sys.stdout, "buffer"):

sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")

if hasattr(sys.stderr, "reconfigure"):

sys.stderr.reconfigure(encoding="utf-8", errors="replace")

elif hasattr(sys.stderr, "buffer"):

sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding="utf-8", errors="replace")

Copilot · 2026-04-15T12:26:03Z

+        # Acquire auth token if not provided
        if not auth_token:


This exchanges a token even when auth_handler_name is empty (dev/Playground mode). That contradicts the later comment indicating the SDK will attach dev tokens from env vars in this mode, and it can also fail/hang if the auth stack expects a non-empty handler name. A safer approach is: only call exchange_token(...) when auth_handler_name is truthy; otherwise skip acquiring auth_token here and let the SDK’s dev-token path populate server_config.headers.

Suggested change

# Acquire auth token if not provided

if not auth_token:

# Acquire auth token if not provided and an auth handler is configured.

# In dev/Playground mode (empty auth_handler_name), skip token exchange here

# and let the SDK attach dev tokens from environment variables.

if not auth_token and auth_handler_name:

Copilot · 2026-04-15T12:26:04Z

        This is only allowed in Development environment AND when SKIP_TOOLING_ON_ERRORS is explicitly set to "true".
        """
-        environment = os.getenv("ENVIRONMENT", os.getenv("ASPNETCORE_ENVIRONMENT", "Production"))
+        environment = os.getenv("PYTHON_ENVIRONMENT", os.getenv("ASPNETCORE_ENVIRONMENT", "Production"))


This is a breaking behavior change for anyone already using ENVIRONMENT to control dev-mode behavior (the previous code checked ENVIRONMENT first). If backwards compatibility is desired for existing sample users, consider falling back through both names (e.g., PYTHON_ENVIRONMENT, then ENVIRONMENT, then ASPNETCORE_ENVIRONMENT) so older setups keep working.

Suggested change

environment = os.getenv("PYTHON_ENVIRONMENT", os.getenv("ASPNETCORE_ENVIRONMENT", "Production"))

environment = (

os.getenv("PYTHON_ENVIRONMENT")

or os.getenv("ENVIRONMENT")

or os.getenv("ASPNETCORE_ENVIRONMENT")

or "Production"

)

Copilot · 2026-04-15T12:26:04Z

+# Scopes requested when calling Graph / MCP APIs on behalf of the user
 AGENTAPPLICATION__USERAUTHORIZATION__HANDLERS__AGENTIC__SETTINGS__SCOPES=https://graph.microsoft.com/.default
-
+AGENTAPPLICATION__USERAUTHORIZATION__HANDLERS__AGENTIC__SETTINGS__ALTERNATEBLUEPRINTCONNECTIONNAME=https://graph.microsoft.com/.default


ALTERNATEBLUEPRINTCONNECTIONNAME reads like it expects a connection name (e.g., SERVICE_CONNECTION), but the template sets it to a scope URL. This will likely misconfigure agentic/OBO token exchange at runtime. Recommend updating the template to use the intended connection name value and keeping scopes only in the ...__SCOPES variables. (This same pattern appears in other updated .env.template files too—worth fixing consistently.)

Suggested change

AGENTAPPLICATION__USERAUTHORIZATION__HANDLERS__AGENTIC__SETTINGS__ALTERNATEBLUEPRINTCONNECTIONNAME=https://graph.microsoft.com/.default

AGENTAPPLICATION__USERAUTHORIZATION__HANDLERS__AGENTIC__SETTINGS__ALTERNATEBLUEPRINTCONNECTIONNAME=SERVICE_CONNECTION

biswapm added 2 commits April 3, 2026 19:08

updated

305ebbd

github-code-quality bot found potential problems Apr 3, 2026

View reviewed changes

biswapm added 4 commits April 9, 2026 21:20

Merge branch 'main' of https://github.com/microsoft/Agent365-Samples …

0e5b26b

…into mcp-v1-v2-changes-python

Fixed Sample to test MCP V2 E2E Google ADK

6f3d5cf

Sample changes to support MCP tools call in local

1baeaba

github-code-quality bot found potential problems Apr 12, 2026

View reviewed changes

Comment thread python/google-adk/sample-agent/main.py Fixed

biswapm added 6 commits April 12, 2026 15:51

removed port clean code

1291907

Changes to support MCP V2

b8a5c95

Merge remote-tracking branch 'origin/main' into mcp-v1-v2-changes-python

b523c12

Deleted test

7172e1c

biswapm marked this pull request as ready for review April 15, 2026 12:18

biswapm requested a review from a team as a code owner April 15, 2026 12:18

Copilot AI review requested due to automatic review settings April 15, 2026 12:18

Copilot AI reviewed Apr 15, 2026

View reviewed changes

Copilot started reviewing on behalf of biswapm April 15, 2026 13:20 View session

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mcp v1 v2 changes python#265

Mcp v1 v2 changes python#265
biswapm wants to merge 12 commits intomainfrom
mcp-v1-v2-changes-python

biswapm commented Apr 3, 2026

Uh oh!

github-actions bot commented Apr 3, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 15, 2026

Uh oh!

Copilot AI Apr 15, 2026

Uh oh!

Copilot AI Apr 15, 2026

Uh oh!

Copilot AI Apr 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")
		sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding="utf-8", errors="replace")

-    sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")
-    sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding="utf-8", errors="replace")
+    if hasattr(sys.stdout, "reconfigure"):
+        sys.stdout.reconfigure(encoding="utf-8", errors="replace")
+    elif hasattr(sys.stdout, "buffer"):
+        sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding="utf-8", errors="replace")
+    if hasattr(sys.stderr, "reconfigure"):
+        sys.stderr.reconfigure(encoding="utf-8", errors="replace")
+    elif hasattr(sys.stderr, "buffer"):
+        sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding="utf-8", errors="replace")

-        # Acquire auth token if not provided
-        if not auth_token:
+        # Acquire auth token if not provided and an auth handler is configured.
+        # In dev/Playground mode (empty auth_handler_name), skip token exchange here
+        # and let the SDK attach dev tokens from environment variables.
+        if not auth_token and auth_handler_name:

-        environment = os.getenv("PYTHON_ENVIRONMENT", os.getenv("ASPNETCORE_ENVIRONMENT", "Production"))
+        environment = (
+            os.getenv("PYTHON_ENVIRONMENT")
+            or os.getenv("ENVIRONMENT")
+            or os.getenv("ASPNETCORE_ENVIRONMENT")
+            or "Production"
+        )

	AGENTAPPLICATION__USERAUTHORIZATION__HANDLERS__AGENTIC__SETTINGS__ALTERNATEBLUEPRINTCONNECTIONNAME=https://graph.microsoft.com/.default
	AGENTAPPLICATION__USERAUTHORIZATION__HANDLERS__AGENTIC__SETTINGS__ALTERNATEBLUEPRINTCONNECTIONNAME=SERVICE_CONNECTION

Conversation

biswapm commented Apr 3, 2026

Uh oh!

github-actions bot commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Dependency Review

Snapshot Warnings

Scanned Files

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 15, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions bot commented Apr 3, 2026 •

edited

Loading